From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 06:46:48 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=daf8a7f2f4cf2df4dcb686d505b05b0e773a0c84;p=emacs.git

merge from trunk
---

daf8a7f2f4cf2df4dcb686d505b05b0e773a0c84